From: Tom Rini <trini@konsulko.com>
Date: Fri, 27 May 2016 19:48:53 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=378f9134eba4665ea94a63653393d25418665fda;p=project%2Fbcm63xx%2Fu-boot.git

Merge git://git.denx.de/u-boot-rockchip
---

378f9134eba4665ea94a63653393d25418665fda